From 31b60f050a2537a27370866a48122aee585678d0 Mon Sep 17 00:00:00 2001 From: Alex Z Date: Thu, 11 Sep 2008 03:50:53 +0000 Subject: [PATCH] (bug 15551) Show deletion log excerpts when a user follows a redlink, even if they can't edit the page. --- CREDITS | 1 + RELEASE-NOTES | 2 ++ includes/Article.php | 13 ++++++++++++- includes/DefaultSettings.php | 2 +- languages/messages/MessagesEn.php | 1 + skins/chick/main.css | 1 + skins/common/cologneblue.css | 2 ++ skins/common/oldshared.css | 1 + skins/modern/main.css | 2 ++ skins/monobook/main.css | 2 ++ skins/simple/main.css | 1 + 11 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CREDITS b/CREDITS index f12d33878a..c38145ee32 100644 --- a/CREDITS +++ b/CREDITS @@ -4,6 +4,7 @@ following names for their contribution to the product. == Developers == * Aaron Schulz +* Alex Z. * Alexandre Emsenhuber * Andrew Garrett * Aryeh Gregor diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 5ed6c8cfb5..6ce168efaf 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -121,6 +121,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN Special:Statistics * (bug 15514) Setting $wgRightsText without $wgRightsUrl now produces a plaintext copyright notice. Patch by Juliano F. Ravasi. +* (bug 15551) Deletion log excerpt is now shown whenever a user vists a + deleted page, even if they are unable to edit it. === Bug fixes in 1.14 === diff --git a/includes/Article.php b/includes/Article.php index 92eec052b7..3bf45ea7c4 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -224,7 +224,18 @@ class Article { } else { $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ); } - + $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut ); + $pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() ); + if( $pager->getNumRows() > 0 ) { + $wgOut->addHtml( '
' ); + $wgOut->addWikiMsg( 'deleted-notice' ); + $wgOut->addHTML( + $loglist->beginLogEventsList() . + $pager->getBody() . + $loglist->endLogEventsList() + ); + $wgOut->addHtml( '
' ); + } return "
\n$ret\n
"; } else { $this->loadContent(); diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index ea7b48b0db..5b78496840 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1383,7 +1383,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '174'; +$wgStyleVersion = '175'; # Server-side caching: diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9d5e3e3d0f..34c7d8f50f 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1180,6 +1180,7 @@ You can go back and edit an existing page, or [[Special:UserLogin|log in or crea You should consider whether it is appropriate to continue editing this page. The deletion log for this page is provided here for convenience:", +'deleted-notice' => "This page has been deleted. The deletion log for the page is provided below for reference.", # Parser/template warnings 'expensive-parserfunction-warning' => 'Warning: This page contains too many expensive parser function calls. diff --git a/skins/chick/main.css b/skins/chick/main.css index ed11bc283e..2f0befb167 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -427,6 +427,7 @@ div.gallerytext { /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index 670996ea38..576e6e0193 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -97,6 +97,7 @@ input.mw-searchInput { width: 106px; } /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn, +div#mw-deleted-notice, div#mw-recreate-deleted-warn { padding: 3px; margin-top: 3px; @@ -104,6 +105,7 @@ div#mw-recreate-deleted-warn { border: 1px solid #6688AA; } div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } \ No newline at end of file diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css index 66ea6156a8..e0931112d3 100644 --- a/skins/common/oldshared.css +++ b/skins/common/oldshared.css @@ -412,6 +412,7 @@ table.multipageimage td { /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } diff --git a/skins/modern/main.css b/skins/modern/main.css index f6d95d6d48..f3c2a40930 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -1000,12 +1000,14 @@ div.mw-lag-warn-high { /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn, +div#mw-deleted-notice, div#mw-recreate-deleted-warn { padding: 3px; margin-bottom: 3px; border: 2px solid #2F6FAB; } div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 4cf1168da7..06e7f65963 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -1501,12 +1501,14 @@ div.mw-lag-warn-high { /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn, +div#mw-deleted-notice, div#mw-recreate-deleted-warn { padding: 3px; margin-bottom: 3px; border: 2px solid #2F6FAB; } div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 90%; } diff --git a/skins/simple/main.css b/skins/simple/main.css index cc76f522a1..1b3f429944 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -395,6 +395,7 @@ table.collapsed tr.collapsable { /* Recreating-deleted-page/reupload file warning and log entries */ div#mw-upload-deleted-warn ul li, +div#mw-deleted-notice ul li, div#mw-recreate-deleted-warn ul li { font-size: 95%; } -- 2.20.1